2235: Fixed tests