updated value set parser to handle new MAT valueset format
updated value set parser to handle the new and old exports from the MAT
fixed tests related to setting expectations from a bundle