Cleanup
Test tweaks