Added tests for w:0 and some small fixes for merging results