Merge "Fix test container remain in docker after tests completion. IMPORTANT."