#3292 removed default room type and fixed few test issues.