Improve test cases
Add basic cucumber features