added support for validation and production tests