slight refactor of tests, make sure they run quickly