consolidating most of the Clean tests (#23)