TEMP: Fix tests