Merge pull request #247 from jamiehannaford/script-fix

Removing race conditions from acceptance tests