Refactored cucumber tests
Merge branch 'algorithm' into development
Merge branch 'development' of https://github.com/thejennywang/bunch into development