UC-1956 Fixed tests