Added unit-tests for model classes