Pulled from Annie's Master version
Fixed chatroom tests to account for fixtures
Merge pull request #4 from MichaelYim/master

Fixed tests