Cleanup
Fix another test issue