Updated with some testcases, as well as mocked calls
Added testcases for duke