Added tests from room. All pass.