Edited the test plan and minor other edits