Merge testing changes into CO600 develop

Better and easier way of testing