Fix tests (probably)