Update Makefiles
Fix unit tests for dispatch_specificty comparator