Add some more tests and switch from TDD style to BDD