Implements #53

Implements 2-argument callback instead of 3-argument callback as
discussed in #53. The updated test specification is an example of
the issues the 2-argument callback was raising.