WIP on TDR test stubs