Untested match support. Implemented restore person test.