gem updates and mock additions needed to get the tests to pass on edge rails