WIP: Coverage improvements
Removed unused 'completion' callback