fixes #2463 - move test files to follow controller move