Turn unit tests back on
Merge pull request #1543 from xt0rted/fix-unit-tests

Turn unit tests back on