Fix tests and reqs for 2.6