Updated code to align to best practices

Removed optional members in callbacks
Removed explicit type inference for DT tests