Test more datatypes, correct handling of null.

Found another edge case.