Test Room.kind and remove unnecessary checks
align test params