Fixes for cpantesters