Change imports for tests to import from bluebottle.
Merge pull request #764 from benkonrath/general-bug-fixes

Change imports for tests to import from bluebottle.