Work on sa support
Add tests for scalar