Merge "port test_quotas into v3 part2"