Fully functional tests
Fix test to run the correct number of times
Changed output formatting for easy consumption