* Fix test_blockchain_json and pyspec simulator for Cancun * Preserve applyDeletes comments * Fix redefinition error * Move test_macro to tests folder