Add additional tests for the callback controller
Merge branch 'master' into fiware_migration