use QuotaSet consistently; fix unit test
5 files changed