Minor Replace Logic

A little patchy, a little hacky.  Too much Core in the Spring in the
Test