Fixing Integration tests