Fix tests,