some tests for the plan and some remodeling of the same