Merge "Improvements on test case setup." into nyc-dev