Fixing and testing details