[bug_0002] Unit tests added