remove test timeout workaround now that tests take five minutes to time out
fix tests, simplify them, and make them conventional
use assert.equal where appropriate
Merge pull request #483 from mykmelez/fix-tests

make tests work again and simplify/conventionalize them