Refactor of query tests - code in superclasses is exercised for every
test
Refactor of OAuth2 token query test classes