Added base classes to test rig