Added unit tests for new class created from refactors