Refactor in model construction
Adding spec for model apartment. Tests OK