Add more functionality to the test plan