Fixed a bug with scalar syntax, with more tests