update test description
refactor common assertions
fix