Add simpletest directory cleanup