Fix unit test, integration test SUCCESS