Add Json-based test cases