WIP: Coverage improvements