Added a test fixture generator
Cleaner JSON encoder