Some cleanup and easier to read test fixture output