Fix tests failing tests of pull request #10