Change in code and test