A few additions to tests to expose an inconsistency between tests and runtime behavior