test(*): add missing cases

Also make some cosmetic changes.