Remove cruft from Tests