merge in of test fixes from 6.0.3