Finish mocking
Merge branch 'master' of github.com:fsamuel-bs/mlanalytics