lots of changes.
Refactored compsorttest