Fixing test suite issues after usr/share/perl5 -> lib migration (2)