Fix and then break the tests again, need to pass in a mock offset map and ensure that the pointers are correct