More updates to Test Plan