Removed unused test snippets
Wording change
Move towards designer-friendly templates