framework fixes and case studied test mods