refactored mock classes, fixed issues with magic calls