Remove error reporting from Controller, make test almost work
Save after undoing everything