Additional tests & stabilizing callback handler