--Added support and tests for new diagnostics module