small tidy and test commit for hipchat