Fixed bad shell type for test in script
Merge remote-tracking branch 'origin' into feature/harts