Beginning work on a couple more integration tests