Adding patch to tuples, fixing impl in hlists, unit tests passing