fixed up inconsistency across tests in facility creation that caused failures, intermittent failures on exercise success.
Merge pull request #490 from bcipolli/test_failures

Fixing broken tests