by slashrsm: Fix tests.
Issue #2381819 by slashrsm: Fix tests.
Issue #2381819 by slashrsm: Fix tests.
Issue #2381819 by slashrsm: Fix tests.
Merge pull request #5 from slashrsm/fix_tests

by slashrsm: Fix tests.