Added tests for Individual and Family