gettings tests to pass again, about halfway there