Some cleanups and change "pass/fail" -> "." so that we can read it all