Adding primitives, tests