Added Guard, failed in weird ways, added controller and model specs to increase coverage.