Replace house identifiers with constants.
Include tests to ensure houses are correctly defined.