slight reorganization of tests