Remove annotations in old tests