Updated AnnotationTest to match GenericSystem2014 's API