Remove test form at bottom of view
Add a helper to handle source name generation