fixed some test spelling and added two new tests: doesn't double combine and doesn't combine elements separated by 0
Merge origin/master