Move tests to package
Add _lang method