Changes according Dominic's review notes:
- added tests for checking callback arguments
- assertion text changed
- check that callback called proper number of times