Got rid of old testcontents? I hope this is okay.