Removed hackishness in Handler my mocking bases.