Added: Additional scalar mapping tests
Modified: Scalar maping tests