Added ContentType and tests