Add tests for models and collection