remove commented out line of code
Inline a constant
Rename variable in test since class was renamed
restructure tests for clarity

Also add additional coverage on a few corner cases
Reduce network requests in MissingVappsForVdc

so that the general usage case doesn't hit the network twice for the
same data.