Remove IPDB import
Begin updating tests

Arghhhhh