Added tests for resolve_candidiates, and amendment, changes matching