split out some tests
split out some grouped files