update tests basing on review feedback