Work on Test Plan