Improve Language unit testing