Added some tests for family definitions and cql