Merge "add unittests of project & refactor response"