Test output improved