Fixes to pass test suite

Hi, I needed these changes to get the tests to pass.

The Test::More fixes are obvious, but I'm not sure about GPIndi.pm as this looks like old code (that isn't expected to work).