Unit-testing added