Adapts general.t  to new Test::More