Wakand 9 Test not well

Rolling back to WAK8 on Win and Mac for now