Removed a sysout.
Removed an empty functoin that wasn't being used.
Fixed two broken tests.