Fixing broken tests due to mismatched classes
Merge remote-tracking branch 'daviddavis/temp_1366806749' into quick-fix/minitest

* daviddavis/temp_1366806749: (2 commits)
  Fixing broken tests due to mismatched classes
  ...