rationalise lists and update tests