Updating for more useful output for testing