Add more tests for model