more cleaning up

making test outputs clearer and easier to follow.