revamp --unit test pass