test fix and code review feedback