Added some extra tests