Fix tests (hopefully)