Suggested context grouping for some tests

Suggested use of context to group tests