Moved ControllerCollectionTests into controller folder