Feature/cucumber bdd

Adding feature tests. Working in progress