Improving comments
Clean tests