Added some extra tests.