Modified Jordan's changes into the test plan. Discuss later.