Added unit-testing