Add predecessor/successor, update tests