misc. test re-factoring for multiple test classes