UML-382: Fix errors in tests