fixed some idiosyncracies with mocking and updateWith