Fix most bokchoy tests