Controller and model tests

included now