Fix unit tests (adjust to language changes)