Added new class to enable testing of same/test unit tests