fix tests that broke from recent Gem updates
Merge branch 'test_fix'