Lang entity clean up and test