working on ndw and airports tests