Tidies fixtures in line with master

(Extracted JSON, dropped public static final)