Regression Test fixes