Consolidate test targets.
19 files changed