Fix callback tests

All integration tests are now passing