Fix tests so they pass in -R mode
3 files changed