test.py clean doesn't need to clean all fields anymore. Cleaned up, commented, made testable.
Small error in JSON library.