Fix requires test and some verification tests.