Added localization support and additional tests