Updated test plan for 3.5