add & cleanup spec