Added extra tests.