Fixed failing tests

Failed because of errors during refactor
and because of unspecified locale.