Update tests with the new changes