stabilize a couple tests that are failing
Merge pull request #1803 from jbertram/master

stabilize a couple tests that are failing