Singular 'testimonial'
Singular for views.
Merge branch 'feature/38'
Merge branch 'master' into test