tidying up some test structure and adding first integration tests
Merge pull request #3 from garycrawford/test-clean-up

tidying up some test structure and adding first integration tests