More clean up

Consolidated as much test data as feasible in set-up method to reduce
duplication