Fixed unit tests for custom data types