debug Changes to make tests work better
Merge branch 'Greg-editing-nima' into Nima-Ghods
Merge branch 'NEW-MASTER' into Nima-Ghods