test directory reorg, fixes #100
Fix order of args of assert.equal()
fix typos