Bug fixing for test run