Improve Language unit testing #2