Improve coverage
Change setup for testing using coverage
Update README.md badges