Latest additions to BDD testing
Small changes to fix a few broken BDD tests