Unit tests for composite
Unit tests for Query