Adding in more touches to digest and updating broken tests