2nd pass and fix test description