Refactor BBR tests