Fixed some tests for SVY-7158 + 1 bug.