Fix up, add tests for 'relate' command line tool