Improved formatting of test