Made mock static and adding tests for it