Modernize tests, might as well