Revise unit test