Updated dependencies;
Refactored mock helpers;