a bit more test code cleanup