move around test files a bit