[TASK] WIP Code Coverage