Fixed Issue with Players waiting for BB

And added tests.