Fixed accidental test implementation for base class and monkey patched core to avoid git fork.