Fix a few bugs with new callback design
Fix e2e tests
Merge pull request #468 from ministryofjustice/feature/callback_bugfixes

Fix a few bugs with new callback design