Add more automatic tests (and increase the coverage)