Future callback fix as well as other test fixes