Lang repository clean up and tests