WIP - trying to add blanket coverage testing