Fixed dubugger
First BDD tests for merging
Added BDD and TDD first tests