Tests: add more templates
Test the new clean methods