Fix family matching error
Complete family tests