dbm/WIP: Revert test N change