Corrected class definitions for content template fixture and table references