Intercept testing in practice

Please look at each commit carefully. Some of the commits change logic, while other simply update the tests.

This depends on Connexions/cnx-archive#274