Get tests working and family stuff working