Improved the annotation property comparator.  Added tests.