Improved Primitive support and better testing