modernize tests