Update tests to match the changes