add more Scala types and tests