Removed dead code. Added ContentType tests.