Minor refacor and testimonial fix