Fix controllers specs
 Update controller specs

Merge branch 'controllertests'
Clean up Sign Up form