fixes tests, adds double check locales and heading