Merge "admin/test_flavors: some code cleanup and factorization"