Improved test strictness
Added wildcard replacement to locale detection