Modernize the test a bit