Clean up the many arguments into a list and unpack
Change a few its to describes.
Add test tags.