Fix test and various.