Fixing test cases

That might explain the CPANTesters failures :-P