Worth adding this test and the one below back in?