Minimal test code cleanup