Modernized tests.