Remove unecessary macros, modify datatest environment to be continuous change scan duration to 3s for continuous scan environments
Remove unecessary macros, modify datatest environment to be continuous change scan duration to 3s for continuous scan environments