Moved the load and cleanup of the ResolvedValueSet to the
LoadTestDataTest and CleanUpTest
Merge remote-tracking branch 'origin/master'