Fix fluent tests - part 1
reorganize test files
addressing Bhuva's feedback
Merge pull request #2177 from NuGet/danliu/testcleanup

Danliu/testcleanup