Fix fetch and add unit tests.