Fix tests, more robust