Fixing testing to not rely on shared DB and updating to new interface