Couple of new classes to test collections