Prepares for locale selector, fixes tests and removes _() function definition