Refactored unit tests to target specific functions. With this, I need to expand the units tests to increase their coverage.