Make some sdb tests more robust so they work again after the latest line number changes.