Refactoring Chatter project references and tests