Move classes, refactor Diagnostic
Simplify ADiagnosticDescription tests
Clarify FeatureSampler description tests