Modernize tests