[544796] Refactor standalone tests prior to addition of execute tests
12 files changed