Fixed bug in popOrder test bug

Fixed bug in popOrder test. Minor edits to the tests for simpler code.