Add in optional plan_id to report on TestCase, fix import error