Tidy match_spec and 'Londonify' testing of doubles matches