More integrated infrastructure. Still have failing node tests.