jeremykendall Fixes failing tests