Fixing test cases

This pull request corrects test cases, and should result in an all or nearly all green run on CPANTesters