polishing scalar unit tests for combinatorial