Revised test cases, formatting & comment edits