API BDD Implementation fixes