Issue #47 - refactoring unit testow.