WIP on qunit test improvements