Updating tests to fix build