[TASK] Bring coverage up

## NOTE: Do not merge until #657 has been merged!