added all the tests except for messaging tests
removed the commented out broken tests