Additional tweaks to make sure all test pass consistently on my local machine (and hopefully in GitHub)

Additional tweaks to make sure all test pass consistently on my local machine (and hopefully in GitHub) #342