Adding internationalization support and additional testing