Corrected tests
Simplifying code, and actually making things stricter with regards to content type. No more allowing weird content types.