controller api in progress, locales chagne, tests fix