Expanded Primitive type detection and updated tests