Swap should->expect to avoid RSpec deprecation warnings
Speed up waiter tests
Add Addressable-based automated matching of URLs