Use empty string instead of nil, update type tests