Fix spinach tests