Move test files into new packages