Tests work with new setup
Merge pull request #476 from MDCox/multInstance

Tests work with new setup