Fixed formatting to stop triggering the testing errors on travis
Updated test wrapper for more readable output