rename deck -> squad
added squad checking
added test for squad checking