some modification to match new test-jiig