Initial work to add integration style tests.
Merge pull request #515 from rorygraves/intg_tests

Initial work to add integration style tests.