Feature/add during callback

have added some tests but are broken. 
can we discuss the failing tests later in office ?