Updating tests accordingly.