add test and fix for builtin types such as tuples too