Added support for cleaning test environment