split off some more tests