some changes to the primitive tests