Minor changes according Dominic and added tests for callbacks order