Minor tests cleanup

[djmattyg007]

• Use functools.wraps() in place of custom code to do the same thing
• Remove old JSON library for testing
• Ensure data directory generated during testing is fully gitignored