Move bbbase.make() to test code