Fix locale test issues