Adding some extra tests