refactoring
Actor: unit-test added