Fixes to the test suite for cib version 2.1