fixing issue #152 - initial logic commit for refactoring unit test callback design