Added formatting of test results and merged John's changes