Minor edits, replaced tester