updating functional tests to BDD