Fixed diagnostics tests