added missing imports. fixes smoke test
Merge pull request #541 from swarbhanu/fix_smoke_test

Fixes buildbot.