Fix string comparison and tests.