Added 'scheme' to Request with matcher and test
Added scheme to default 'match_on'
Updated 'set' to be compatible with 2.6