Finished all tests for models, modified to follow company conventions to the best of ability