Integration testing

Here is the pull request we discussed this morning.