Fix unit tests
Fix locale use
Remove debug