Revise unit tests