Changes to allow tests to be written in any language