OnePlayerOneMatch, roomPresent tests work
resolved conflicts in merge