Fix tests (finally...)