Merge "Adds provider flavor capabilities API tests"