Implemented model methods; all model tests pass