BDD Compliance :)

See the issue msgs