changed localization interface, fixed tests