Merge "Integration tests cleanup"