MDS parameter values
Improve and test helper
Add country gaul code to location test data
Refactor helper to only construct lists once and add new occurrence during while