ERRAI-516 - Unit tests