Fix for issue #203, removed activation blocks and updated tests to bind to call scope.