Continue refactoring quota enforcer spec

* Added additional sub-contexts to enhance testing of catalog changes
* Used helper methods

[#67082390]