Update test descriptions and simplify some assertions