Added sol:ndd_test support.