fixes
fixed merge
register and cancel tests