This is why we have test cases... Fixes for @EvictTuples