Merge "Adds flavor API tests"