updated test_plan a bit