Consolidate setup; load faster; tests can be run individually