Extend the tests