minor reorganization of tests