Fix hipchat and make unittests pass again (more work required).