Issue 25

Fixes test concurrency and quickens tests: alas, fixes #22 and fixes #25