Combined Executable and String ResourceDefinitions, and marked some tests as most-likely-obsolete