Fixes to get tests running for BB refaktor

Tests should pass now. This depends on
https://github.com/onepercentclub/bluebottle/pull/445