Model done with tests passing