Preparations for integration tests
Bugs within stop fixed