Added tests for more room functions, and fixed some bugs found while testing