Add fixes to controller and model + tests