Fix integration test setup and teardown... some tests stil fails