String manipulation has changed; fixing minor test failures.