Add callback chain containter with locking as well as tests