Fix passing of callbacks. Adjust test fixture.