Remove redundant exceptions, fix predefined annotations, update test data