Debian: use better API, improve coverage