Refactoring the adaptor classes.
Catering for different types of tests - WIP
Initial support for manual tests
Merge branch 'master' into manual-tests
Trying to make an integration test more robust