More Integration tests

Added more integration tests.
Small fixes for the broker