Add customization tests
Cleanup