Changes and unified primitive test suite