Merge pull request #102 from Connexions/functional-test-cleanup

Functional test cleanup
WIP