used tuple instead of sun specific class - Pair in tests too