Changed default message pump types in startup.
Fixed broken convention test.
Fixed bug in integration test.