cleaner language detection
grouped tests
removed the now unneded unsafe parameter