make sure order of combinations stays consistent
code cleanup
remove unneeded test helper
Merge pull request #31 from lauyeung/more-test-fixing

make sure order of combinations stays consistent