Get rid of the sentinels in the test suites