split off some tests