refactor: expand test coverage from 58.59% to 60.11% with 44 new test…

refactor: expand test coverage from 58.59% to 60.11% with 44 new test… #73