ARQ-863 Improved log message and cleaning up resources after tests have been run