Add not functioning mock support
Merge commit '8023c4d85e544c303f9dfc1fb34375926f1bec93' into mock