Added Primitive Tests.
Made Primitives more efficient.