r4792: use type safety int the test suite too