Extend the tests more.