Small unit test refactor pass, added expected arguments for mocked functions