Added some additional tests.