WIP working on adding more test coverage

This is a work in progress PR to get the testing coverage up to 100%