added tests for most model classes