tests are modified to match Mars. 
37 files changed