Renamed UnitTest classes for consistency. Removed unnecessary usings
Renamed variables in MDFS for consistency
Removed resharper warnings with no functional changes to code.