Remove 'blocking' package, update tests