Unit test enhancements

Improved the unit tests a little so they are less dependent on specific wordlist. Should make it easier to extend the wordlist if testing new features requires it.