tests passing again, abstract tuples propsal removed