Make test more lenient about ordering
Avoid bug caused by TupleEntry reuse
Merge pull request #37 from TapFwd/testfix

Minor bugfixes