move stuff out of test group that doesnt belong