Move controller tests to subfolder