Fixed

Fixed all remaining issues.  Removed extra System.out.println calls.
Should run all 3 tests 100% clean.