TDD BDD for submission
merge fix