Issue #92: Improve test coverage

Signed-off-by: rafaelatc3sl <rpd17@c3sl>
2 jobs for issue/92 in 1 minute and 7 seconds (queued for 2 seconds)