Added ClientMessageFactoryTest
Removed blocking methods that only existed for integration tests.