Fix tests second try

I must have selected the wrong branch to merge into, because I think the previous pull request ended up in SimTk/msmbuilder fix_tests branch... 

Sorry...