Updating tests as well