Changed TestRoom to generic Room class
Merge pull request #1 from Chase-C/mal20k

Changed TestRoom to generic Room class