primitive test fixes