Added tests for extra functionality for controller and model