fix mock and dodgy call args in test