Verify and Fix Code Analyzers and Tests to support new fluent generic base type declaration

[ardalis]

Current tests all use the older types; need to update them to use new fluent generic declarations and then make them pass if they don't.