Refactor, cleanup
Try out testling for tests, but keep compatibility with QUnit