Test Room.kind and remove unnecessary checks