Test commands updated to BDD style