Use test setup/cleanup hooks; restrict concurrency
Merge pull request #1 from richdougherty/try2

Use test setup/cleanup hooks; restrict concurrency