GH75 - reworked tests, reworked some base classes, resolved problems