Try to reasonably increase test coverage

Some parts are really never used within the application and should of
course be stripped out, but others are not automatically testable and
for some, a sensible solution is defered to a later time...