Add destroy spec and fix controller spec to reflect changes