First attempt
Added done() to tests
Merge pull request #13 from mbehrendt/testfix

Testfix