Improve output, and update tests accordingly
This should have gone in with the last commit, as well