WIP fixing coverage issues