Minor fixes for replwrap tests