Smoke test fixes.
Merge pull request #12 from malcyL/malcyl-more-smoke-test-fixes

Smoke test fixes.