Change rest of unit tests to use assertEquals( String, String ) func.