commented out controller test
Merge branch 'application-controller-test'
deleted unused files