clearing up some unneeded pdb calls
simplifying tests to allow them to run faster