Re-introduce primitives tests