attempt to fix broken tests... and things broken by tests
applying stashed changes