more unit tests; corrected case of scalar mask