Improve extra tests.