Merge changes and record controller test
Deleted some controllers.
More controller tests