Clean up test description; no review
WIP
WIP