Added data types (missing tests)