remove unused teardown function
better formatting of imports
fix test failures from DefaultProductPlan