Use honcho in test framework

Pull in changes from fork