Updated language definition and test files to bring them inline with each other.