Refactoring output compare classes.
Updating jUnit tests for output compare.