Add the tests changes for previous commit