More witch/mafia tests

not passing