Added additional tests.