Contents test reuse 2

I pulled the trigger on my first set of patches a bit too soon.