Fix qunit tests

Change-Id: I168170e5383ac738e87ed7037b8c247c4fd12447
Merge "Fix qunit tests"