add self.return
add acknowledgement and notification-typed tests