remove pdb and fixed more tests