Removing remaining old annotation tests.

We need to move them over to the new tests later.