Fix for blocking
Extended tests