Fix more test issues with older numpy versions