working through the unit tests, principally .call issues