[AI-415] Fixes unit tests