There were a few tests already in the tree that overlapped ones that I added in the previous commit. I've consolidated these and taken information from the deleted ones where applicable, and improved on the autogenerated assertion messages.