BAC-732: Fixing unit test