added new solution for unit-testing