Modernised some tests.