[330] - fixes integration test problems