Refactoring MOM connection; added test data.