add more test scenarios basing on review feedback