fixed tests (explicitly set locale), null guard