Fixed locale issue

Fixed failing test with, euhm, 6 commits.