Added scalar tests