Add tests for other datatypes