Issue #504 adding specs in controller and fixing specs in model