All tests have skeletons, plus some clean-up