Some test related changes
Some test related changes