Adding missing controller tests for diagnostics tool