Added more room selection tests