Unit test fixes
Merge pull request #12 from gnarf37/ww_new_layout_implementation

Unit test fixes