Merge test for the controllers into one file