Added USERDEFS to testing
Added tests for content types