Pr 2689

Clean up the tests a bit.

The yield statements (or the inverted if condition?) seem to have prevented some of the slicing test from running -- they show now some failures.