fix broken tests from #342
Merge pull request #343 from criedel/master-5.3

fix broken tests from #342