Minor edits for passing tests.