Merge controller and models for test