Delay added for always callbacks
Lint and test updates