added test for Room and fixed some bugs