Added test plan, changes to test driver
Changes test driver etc