Make tests running with BS3 version [WIP]