Include Comparable in Hand, touch up tests accordingly