Fixing bad annotations and class mocks