Simplified generics, tests, jacoco, coveralls