Updated status controller and model tests