fix BDD tests only 21 failing
fix more issues related to BDD tests