- Update on tests done on dispute module
Merge branch 'working'