Small refactors, fixes of coverage
Remove 1.5.x from build matrix