fixup typo in test name
start extracting TestPlan class
encapsulate TestPlan a little better
remove duplication in TestPlan