Test infrastructure improvements, allow for integration tests.