Adding tests
Removed get-language