Initial work to add integration style tests.