test plans and scripts tidied up