Added model to work controller. Updated tests.