HOPKINS: Refactor PLAN_TEST