Add some extra tests