QUnit in progress, somewhat working.
Merged upstream changes with QUnit work.