Added CompositeGrid to the tests

Reorganized some tests