Fix tests (a bit)