Cut down on actual usages of the Aquarius class by introducing a superclass for certain unit test cases.