update NGWD tests
update SOS 2 support, add SOS 2 tests