Issue #160 - Add mock methods