Added CompositeGrid tests

Fixed errors in CompositeGrid