Refactor command helpers
Update profile templates
Add profile test