Moved tests to BDD skeleton