fixed unittest folder tests
Merge remote-tracking branch 'origin/master'
fixed importing for the iron python