updated testNet program to adjust to slight change in framework file locations
adjustment to address reorder warning
cleaning up warnings
Merge branch 'master' into cloud
updated python code