Eng 4141

Bring in a few more test fixes