Added another test, fixed broken function parameters, commented the tests, added stubs and mocks