Updating tests accordingly