Merge change 1074

* changes:
  fix the sim build.  disables the tests for now.