more test-oriented factoring to cotrix-test-common