Added BroadcastListenerIntegrationTest, did test refactors.