combine Base.Pair and Base.Collections.Pair

add comparisons for Pair

start fixing tests