Make Integration tests more robust