Added additional types and tests