Abhinav: Fixing minor issues in the running of the tests.