notes on unit test updates, these long calls must be someplace else