Modified the test to use the new primitives.