MAINT: integrate: a bit of clean up in some test code.