Add scalar check to data and update tests