Fixed tests, cleaned up output a bit