Partially refactored Json tests