Improving some names
Creating test for GreedyTrackOrganizer
Adding some more tests and fixing bug