fix for missing Language header

I only adjusted the tests based on @dmbasso's branch. Let me know if anything is needed to get this merged.