tidy up TestPlan class
experiment with fluent AnnotationLogic interface