Fix tests to work with new primops
Fix imports
Update tests for new primops