De-listing

Not for merging yet.
I would really like to see this as a stand-alone fixture. Coupling all of these semi-related tests by using the same test data makes them difficult to read.