Fixing tests that failed. Added a function to filter dicts based on value instead of key. Added M&S data to grid options rather than custom options
