Fixed a couple tests
Cleaned up test output
Fixed a bug with display results
Removed unused code