changed locale calls to the new ones
changed no_plan to eliminate warning