Added NW test fix