Added more tests for models