Improved the test config
Merge pull request #1 from GrahamCampbell/v2-testing

V2 Testing