Use sets for test comparisons
Merge pull request #4 from opoplawski/test

Use sets for test comparisons.
Merge pull request #1 from shazow/master

latest from upstream