Fix compilation for almost all tests