Modified dependencies, added meck for mocking