updated plans and tests