Merge pull request #2030 from dchill42/unit_tests

Replaced Mock_Core_Lang with PHPUnit mockups