Fix tests2