[FEATURE] Increase unit and integ test coverage

[jowg-amazon]

Is your feature request related to a problem?
A clear and concise description of what the problem is, e.g. I'm always frustrated when [...]

What solution would you like?
A clear and concise description of what you want to happen.

What alternatives have you considered?
A clear and concise description of any alternative solutions or features you've considered.

Do you have any additional context?
Add any other context or screenshots about the feature request here.

[dblock]

[Catch All Triage - 1, 2, 3, 4, 5]

@jowg-amazon Edit the issue description please, maybe include the current test coverage % and the desired %?