Fix test and enhance README