More logical changes and beginnings of upstream sync unit test infrastructure
blahstashaglke
pushing latest