Made two of the apartment test work, made a change in the apartment model to fix an error.