Adjust for the xmodule init method refactoring on master

move category and location into module data content as hardcoded
specially treated fields
Fix a few tests using templates rather than cateogries.