Refactoring. Comparers moved to test project.