Some more updates to the test plan