Improved Primitive support and better testing

No match.