Adding Room test and small changes to room