touch up tests / generalise etc