fixed unit test according with latest changes