Added two tests to CC tests
Added changes...?
fixed location comparator to avoid null pointer exception in case of unavailable user location
Added EC tests and CC tests
Added EC test file
fixed location comparator to avoid null pointer exception in case of no available user location
merging issues.