Merge "Make test_detail_quota() test more generic"