Really fix load-mocks