Add webmock and make feature more sensible