Move implementation and tests of #813 to their respective 'living' folders