Begin fixing controller test
Fix merge conflicts
Fix syntax errors in controller spec