Meck update

We need to first merge #2, then rebase this. 6 tests fail for eunit, but they fail on master, as well.