Updated: runtime tests are now all JSON
Updated: various names