Issues with test & make [was Time for 3.1.7 ?]