Added some extra tests
Added some extra tests