Refactored room tests to be based solely on mixins