added tests and internationalization done