WIP Change cucumber tests

Remove all old tests
Add tests with easier to read descriptions
Improve test coverage