actually added primitives and updated testing suite