Try to fix test infrastructure