Changed other test files also