Added some new tests.