Merge bugfix for test-suite correctness.